projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1f9e7b c9a7394)
; Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Thu, 13 Aug 2020 14:51:03 +0000 (07:51 -0700)
committerGlenn Morris <rgm@gnu.org>
Thu, 13 Aug 2020 14:51:03 +0000 (07:51 -0700)
The following commits were skipped:

c9a739408d Fix face merging at EOL when inherited face specifies :extend
f946e48bf5 Fix face extension past EOL in overlay strings


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.